fixing join mapping - take 1 #410
Conversation
| @@ -5,26 +5,26 @@ import Foundation | |||
| public final class QueryBuilder<Model, Result> where Model: Fluent.Model, Model.Database: QuerySupporting { | |||
| /// The query being built. | |||
| public var query: DatabaseQuery<Model.Database> | |||
|
|
|||
There was a problem hiding this comment.
there's an xcode option to delete whitespace on empty lines. please enable that to reduce the git noise here :)
| let q = self.query | ||
| let resultTransformer = self.resultTransformer | ||
| return connection.flatMap(to: Void.self) { conn in | ||
| return Model.Database.execute(query: q, into: { row, conn in | ||
| resultTransformer(row, conn).map(to: Void.self) { result in | ||
| return try handler(result) | ||
| }.catch { error in | ||
| print("[Fluent] Skipping row: \(error)") | ||
| }.catch { error in |
There was a problem hiding this comment.
formatting needs fixing here
| @@ -43,21 +43,33 @@ extension QueryField: ExpressibleByStringLiteral { | |||
|
|
|||
| extension Dictionary where Key == QueryField { | |||
| /// Accesses the _first_ value from this dictionary with a matching field name. | |||
| public func firstValue(forField fieldName: String) -> Value? { | |||
| public func firstValue(forField fieldName: String, on entity: String) -> Value? { | |||
There was a problem hiding this comment.
this "firstValue" should stay the same (no on entity label). Use value(forEntity entity: String, atField field: String) instead. A QueryField with same table name and entity is the same query field, so it doesn't make sense to say "first" value for a specific field name and entity--it's the "only value"
| return try D.init(from: decoder) | ||
| } | ||
| } | ||
|
|
||
| /// MARK: Private | ||
|
|
||
| fileprivate final class _QueryDataDecoder<Database>: Decoder where Database: QuerySupporting { | ||
| fileprivate final class _QueryDataDecoder<M>: Decoder where M: Model, M.Database: QuerySupporting { |
There was a problem hiding this comment.
I think I'd prefer to keep this generic on the Database and just pass in entity: String during init so that this can be used for non-model types (very common) as well!
rafiki270
force-pushed
the
fixing-join-mapping
branch
2 times, most recently
from
1801910
to
dd6ebf6
Compare
rafiki270
force-pushed
the
fixing-join-mapping
branch
2 times, most recently
from
97be58b
to
8e7688a
Compare
rafiki270
force-pushed
the
fixing-join-mapping
branch
from
8e7688a
to
ea2a78b
Compare
|
@Tanner now it should be good to go, I had to test in my app first to find all still works |
I had to pass the info about the model down the generics chain ...
In the
firstValuemethod I now first try to check for the "main" id and then have a fallback onto any "foreign" keys to the model. Obvious downside to this is that you won't be able to get a join field with the same name as you may have in the "main" table but its still an improvement me thinks ...Sorry for the whitespaces, stupid copy/paste from my projects dependencies ... will remove if you confirm I am on the right path ...